From 2b33da526b6cfd458f90bb6e2b8d5411c2a62a8b Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 27 Feb 2002 00:37:35 +0000 Subject: [PATCH] Chain up before drawing the scale values so that the number is drawn in Tue Feb 26 19:32:42 2002 Owen Taylor * gtk/gtk[hv]vscale.c (gtk_[hv]scale_expose): Chain up before drawing the scale values so that the number is drawn in the right place instead of one step back. (#61743, patch from Satyajit Kanungo) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkhscale.c | 12 +++++++++--- gtk/gtkvscale.c | 8 +++++++- 9 files changed, 65 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5943462795..27bce648be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Feb 26 19:32:42 2002 Owen Taylor + + * gtk/gtk[hv]vscale.c (gtk_[hv]scale_expose): Chain + up before drawing the scale values so that the number + is drawn in the right place instead of one step + back. (#61743, patch from Satyajit Kanungo) + Tue Feb 26 19:16:28 2002 Owen Taylor * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 5943462795..27bce648be 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Tue Feb 26 19:32:42 2002 Owen Taylor + + * gtk/gtk[hv]vscale.c (gtk_[hv]scale_expose): Chain + up before drawing the scale values so that the number + is drawn in the right place instead of one step + back. (#61743, patch from Satyajit Kanungo) + Tue Feb 26 19:16:28 2002 Owen Taylor * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5943462795..27bce648be 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Tue Feb 26 19:32:42 2002 Owen Taylor + + * gtk/gtk[hv]vscale.c (gtk_[hv]scale_expose): Chain + up before drawing the scale values so that the number + is drawn in the right place instead of one step + back. (#61743, patch from Satyajit Kanungo) + Tue Feb 26 19:16:28 2002 Owen Taylor * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5943462795..27bce648be 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Tue Feb 26 19:32:42 2002 Owen Taylor + + * gtk/gtk[hv]vscale.c (gtk_[hv]scale_expose): Chain + up before drawing the scale values so that the number + is drawn in the right place instead of one step + back. (#61743, patch from Satyajit Kanungo) + Tue Feb 26 19:16:28 2002 Owen Taylor * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5943462795..27bce648be 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Tue Feb 26 19:32:42 2002 Owen Taylor + + * gtk/gtk[hv]vscale.c (gtk_[hv]scale_expose): Chain + up before drawing the scale values so that the number + is drawn in the right place instead of one step + back. (#61743, patch from Satyajit Kanungo) + Tue Feb 26 19:16:28 2002 Owen Taylor * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5943462795..27bce648be 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Tue Feb 26 19:32:42 2002 Owen Taylor + + * gtk/gtk[hv]vscale.c (gtk_[hv]scale_expose): Chain + up before drawing the scale values so that the number + is drawn in the right place instead of one step + back. (#61743, patch from Satyajit Kanungo) + Tue Feb 26 19:16:28 2002 Owen Taylor * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5943462795..27bce648be 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Tue Feb 26 19:32:42 2002 Owen Taylor + + * gtk/gtk[hv]vscale.c (gtk_[hv]scale_expose): Chain + up before drawing the scale values so that the number + is drawn in the right place instead of one step + back. (#61743, patch from Satyajit Kanungo) + Tue Feb 26 19:16:28 2002 Owen Taylor * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): diff --git a/gtk/gtkhscale.c b/gtk/gtkhscale.c index 537217bcb7..3d8df65d69 100644 --- a/gtk/gtkhscale.c +++ b/gtk/gtkhscale.c @@ -159,7 +159,13 @@ gtk_hscale_expose (GtkWidget *widget, range = GTK_RANGE (widget); scale = GTK_SCALE (widget); hscale = GTK_HSCALE (widget); - + + /* We need to chain up _first_ so the various geometry members of + * GtkRange struct are updated. + */ + if (GTK_WIDGET_CLASS (parent_class)->expose_event) + GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event); + if (scale->draw_value) { PangoLayout *layout; @@ -231,6 +237,6 @@ gtk_hscale_expose (GtkWidget *widget, g_object_unref (G_OBJECT (layout)); } - - return (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event); + + return FALSE; } diff --git a/gtk/gtkvscale.c b/gtk/gtkvscale.c index 775f670236..9fa56f76ef 100644 --- a/gtk/gtkvscale.c +++ b/gtk/gtkvscale.c @@ -162,6 +162,12 @@ gtk_vscale_expose (GtkWidget *widget, scale = GTK_SCALE (widget); vscale = GTK_VSCALE (widget); + /* We need to chain up _first_ so the various geometry members of + * GtkRange struct are updated. + */ + if (GTK_WIDGET_CLASS (parent_class)->expose_event) + GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event); + if (scale->draw_value) { PangoLayout *layout; @@ -232,5 +238,5 @@ gtk_vscale_expose (GtkWidget *widget, g_object_unref (G_OBJECT (layout)); } - return (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event); + return FALSE; } -- 2.30.2